From: David S. Miller Date: Fri, 30 Nov 2012 17:22:04 +0000 (-0500) Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~9797^2~159 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dad52fd964c54aa275ebb5c935ef8d8b0eded74d;p=linux-4.9.git Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Included changes: - Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN Signed-off-by: David S. Miller --- dad52fd964c54aa275ebb5c935ef8d8b0eded74d